bitkeeper revision 1.1159.231.2 (41f8c846X6nmyCraD342rP9SirCaqg)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc .rootkeys
index 7fd3ddd868002fcaceda59ab086517473d17d95b,b14c560ec86e660f5f18ced1145c658d09d9c3a4..9f2d05bfccf21b5bca25f7ccda179c0ad8233907
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -313,8 -292,10 +313,8 @@@
  413cb3b5F56TvQWAmO5TsuzhtzLFPQ netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c
  413cb3b53nyOv1OIeDSsCXhBFDXvJA netbsd-2.0-xen-sparse/sys/nfs/files.nfs
  413aa1d0oNP8HXLvfPuMe6cSroUfSA patches/linux-2.6.9/agpgart.patch
- 40e1b09db5mN69Ijj0X_Eol-S7dXiw tools/Make.defs
 -413aa1d0ewvSv-ohnNnQQNGsbPTTNA patches/linux-2.6.9/drm.patch
 -418abc69J3F638vPO9MYoDGeYilxoQ patches/linux-2.6.9/nettel.patch
  3f776bd1Hy9rn69ntXBhPReUFw9IEA tools/Makefile
+ 40e1b09db5mN69Ijj0X_Eol-S7dXiw tools/Rules.mk
  4124b307nRyK3dhn1hAsvrY76NuV3g tools/check/Makefile
  4124b307vHLUWbfpemVefmaWDcdfag tools/check/README
  4124b307jt7T3CHysgl9LijNHSe1tA tools/check/check_brctl

diff --cc tools/libxc/Makefile
Simple merge

diff --cc tools/libxutil/Makefile
Simple merge